From: Juri Linkov <juri@jurta.org>
Date: Fri, 28 Aug 2009 23:49:32 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~10810
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=31a23b86f37642b8e954c3118283cf9bf0c005a5;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d7a132584ac..0784ea8cc2b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2009-08-28  Juri Linkov  <juri@jurta.org>
+
+	* files.el (magic-fallback-mode-alist): Add ZIP magic number
+	associated with `archive-mode'.
+
+	* image.el (image-type-header-regexps): Use only JPEG magic number
+	to determine JPEG images, and don't use `image-jpeg-p' because
+	Emacs can display non-JFIF non-Exif JPEG images.
+
 2009-08-28  Juanma Barranquero  <lekktu@gmail.com>
 
 	* arc-mode.el (archive-mode):